From ee606d1684f6c1f6284e56737fd9cc8d8f2653f3 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 14 Jun 2011 15:35:34 +0200 Subject: [PATCH] gail: Include files directly Instead of including , include "gailfoo.h" Private headers should be included like this (to make it esily visible that the headers are private) and we want to move this directory to a different name, so hardcoding the directory name is counterproductive to that. --- modules/other/gail/gail.h | 86 +++++++++++------------ modules/other/gail/gailarrow.h | 2 +- modules/other/gail/gailbooleancell.h | 2 +- modules/other/gail/gailbox.h | 2 +- modules/other/gail/gailbutton.h | 2 +- modules/other/gail/gailcalendar.h | 2 +- modules/other/gail/gailcellparent.h | 2 +- modules/other/gail/gailcheckmenuitem.h | 2 +- modules/other/gail/gailchecksubmenuitem.h | 2 +- modules/other/gail/gailcombobox.h | 2 +- modules/other/gail/gailcontainer.h | 2 +- modules/other/gail/gailcontainercell.h | 2 +- modules/other/gail/gailentry.h | 2 +- modules/other/gail/gailexpander.h | 2 +- modules/other/gail/gailframe.h | 2 +- modules/other/gail/gailimage.h | 2 +- modules/other/gail/gailimagecell.h | 2 +- modules/other/gail/gaillabel.h | 2 +- modules/other/gail/gaillinkbutton.h | 2 +- modules/other/gail/gailmenu.h | 2 +- modules/other/gail/gailmenuitem.h | 2 +- modules/other/gail/gailmenushell.h | 2 +- modules/other/gail/gailnotebook.h | 2 +- modules/other/gail/gailnotebookpage.h | 2 +- modules/other/gail/gailpaned.h | 2 +- modules/other/gail/gailprogressbar.h | 2 +- modules/other/gail/gailradiobutton.h | 2 +- modules/other/gail/gailradiomenuitem.h | 2 +- modules/other/gail/gailradiosubmenuitem.h | 2 +- modules/other/gail/gailrange.h | 2 +- modules/other/gail/gailrenderercell.h | 2 +- modules/other/gail/gailscale.h | 2 +- modules/other/gail/gailscalebutton.h | 2 +- modules/other/gail/gailscrollbar.h | 2 +- modules/other/gail/gailscrolledwindow.h | 2 +- modules/other/gail/gailseparator.h | 2 +- modules/other/gail/gailspinbutton.h | 2 +- modules/other/gail/gailstatusbar.h | 2 +- modules/other/gail/gailsubmenuitem.h | 2 +- modules/other/gail/gailtextcell.h | 2 +- modules/other/gail/gailtextview.h | 2 +- modules/other/gail/gailtogglebutton.h | 2 +- modules/other/gail/gailtreeview.h | 4 +- modules/other/gail/gailwindow.h | 2 +- 44 files changed, 87 insertions(+), 87 deletions(-) diff --git a/modules/other/gail/gail.h b/modules/other/gail/gail.h index 2ae956af2a..e3695814d6 100644 --- a/modules/other/gail/gail.h +++ b/modules/other/gail/gail.h @@ -1,43 +1,43 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "gailadjustment.h" +#include "gailarrow.h" +#include "gailbooleancell.h" +#include "gailbox.h" +#include "gailbutton.h" +#include "gailcalendar.h" +#include "gailcell.h" +#include "gailcheckmenuitem.h" +#include "gailcombobox.h" +#include "gailcontainer.h" +#include "gailcontainercell.h" +#include "gailentry.h" +#include "gailexpander.h" +#include "gailframe.h" +#include "gailimage.h" +#include "gailimagecell.h" +#include "gaillabel.h" +#include "gaillinkbutton.h" +#include "gailmenu.h" +#include "gailmenushell.h" +#include "gailmenuitem.h" +#include "gailnotebook.h" +#include "gailpaned.h" +#include "gailprogressbar.h" +#include "gailradiobutton.h" +#include "gailradiomenuitem.h" +#include "gailrenderercell.h" +#include "gailrange.h" +#include "gailscale.h" +#include "gailscalebutton.h" +#include "gailscrollbar.h" +#include "gailscrolledwindow.h" +#include "gailseparator.h" +#include "gailspinbutton.h" +#include "gailstatusbar.h" +#include "gailtextcell.h" +#include "gailtextview.h" +#include "gailtogglebutton.h" +#include "gailtoplevel.h" +#include "gailtreeview.h" +#include "gailutil.h" +#include "gailwidget.h" +#include "gailwindow.h" diff --git a/modules/other/gail/gailarrow.h b/modules/other/gail/gailarrow.h index f2bfa3e3f1..e8a8772e66 100644 --- a/modules/other/gail/gailarrow.h +++ b/modules/other/gail/gailarrow.h @@ -20,7 +20,7 @@ #ifndef __GAIL_ARROW_H__ #define __GAIL_ARROW_H__ -#include +#include "gailwidget.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailbooleancell.h b/modules/other/gail/gailbooleancell.h index f888b1dcd3..8274c8c4bc 100644 --- a/modules/other/gail/gailbooleancell.h +++ b/modules/other/gail/gailbooleancell.h @@ -21,7 +21,7 @@ #define __GAIL_BOOLEAN_CELL_H__ #include -#include +#include "gailrenderercell.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailbox.h b/modules/other/gail/gailbox.h index 403f163b80..57d81d090e 100644 --- a/modules/other/gail/gailbox.h +++ b/modules/other/gail/gailbox.h @@ -20,7 +20,7 @@ #ifndef __GAIL_BOX_H__ #define __GAIL_BOX_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailbutton.h b/modules/other/gail/gailbutton.h index cf6d715ed7..e9c7288891 100644 --- a/modules/other/gail/gailbutton.h +++ b/modules/other/gail/gailbutton.h @@ -20,7 +20,7 @@ #ifndef __GAIL_BUTTON_H__ #define __GAIL_BUTTON_H__ -#include +#include "gailcontainer.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailcalendar.h b/modules/other/gail/gailcalendar.h index 5a99976a0a..857358fb2c 100644 --- a/modules/other/gail/gailcalendar.h +++ b/modules/other/gail/gailcalendar.h @@ -20,7 +20,7 @@ #ifndef __GAIL_CALENDAR_H__ #define __GAIL_CALENDAR_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailcellparent.h b/modules/other/gail/gailcellparent.h index ba750ef6e8..a7505bd12d 100644 --- a/modules/other/gail/gailcellparent.h +++ b/modules/other/gail/gailcellparent.h @@ -22,7 +22,7 @@ #define __GAIL_CELL_PARENT_H__ #include -#include +#include "gailcell.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailcheckmenuitem.h b/modules/other/gail/gailcheckmenuitem.h index e78d38fb3c..c62f988aa3 100644 --- a/modules/other/gail/gailcheckmenuitem.h +++ b/modules/other/gail/gailcheckmenuitem.h @@ -20,7 +20,7 @@ #ifndef __GAIL_CHECK_MENU_ITEM_H__ #define __GAIL_CHECK_MENU_ITEM_H__ -#include +#include "gailmenuitem.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailchecksubmenuitem.h b/modules/other/gail/gailchecksubmenuitem.h index c77bd663cc..4f77b98587 100644 --- a/modules/other/gail/gailchecksubmenuitem.h +++ b/modules/other/gail/gailchecksubmenuitem.h @@ -20,7 +20,7 @@ #ifndef __GAIL_CHECK_SUB_MENU_ITEM_H__ #define __GAIL_CHECK_SUB_MENU_ITEM_H__ -#include +#include "gailsubmenuitem.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailcombobox.h b/modules/other/gail/gailcombobox.h index be8eae99eb..a82f3ba3bb 100644 --- a/modules/other/gail/gailcombobox.h +++ b/modules/other/gail/gailcombobox.h @@ -20,7 +20,7 @@ #ifndef __GAIL_COMBO_BOX_H__ #define __GAIL_COMBO_BOX_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailcontainer.h b/modules/other/gail/gailcontainer.h index 58adc88eb3..01241996a2 100644 --- a/modules/other/gail/gailcontainer.h +++ b/modules/other/gail/gailcontainer.h @@ -20,7 +20,7 @@ #ifndef __GAIL_CONTAINER_H__ #define __GAIL_CONTAINER_H__ -#include +#include "gailwidget.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailcontainercell.h b/modules/other/gail/gailcontainercell.h index 739a334504..3892b5ca00 100644 --- a/modules/other/gail/gailcontainercell.h +++ b/modules/other/gail/gailcontainercell.h @@ -21,7 +21,7 @@ #define __GAIL_CONTAINER_CELL_H__ #include -#include +#include "gailcell.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailentry.h b/modules/other/gail/gailentry.h index 4387730c56..8a1d6fd7c9 100644 --- a/modules/other/gail/gailentry.h +++ b/modules/other/gail/gailentry.h @@ -20,7 +20,7 @@ #ifndef __GAIL_ENTRY_H__ #define __GAIL_ENTRY_H__ -#include +#include "gailwidget.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailexpander.h b/modules/other/gail/gailexpander.h index 0e958b5f77..40664d4063 100644 --- a/modules/other/gail/gailexpander.h +++ b/modules/other/gail/gailexpander.h @@ -20,7 +20,7 @@ #ifndef __GAIL_EXPANDER_H__ #define __GAIL_EXPANDER_H__ -#include +#include "gailcontainer.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailframe.h b/modules/other/gail/gailframe.h index 4c832ed537..61b61b4fd5 100644 --- a/modules/other/gail/gailframe.h +++ b/modules/other/gail/gailframe.h @@ -20,7 +20,7 @@ #ifndef __GAIL_FRAME_H__ #define __GAIL_FRAME_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailimage.h b/modules/other/gail/gailimage.h index d3d2b523c4..18188df3bb 100644 --- a/modules/other/gail/gailimage.h +++ b/modules/other/gail/gailimage.h @@ -20,7 +20,7 @@ #ifndef __GAIL_IMAGE_H__ #define __GAIL_IMAGE_H__ -#include +#include "gailwidget.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailimagecell.h b/modules/other/gail/gailimagecell.h index f317801320..23aac47a21 100644 --- a/modules/other/gail/gailimagecell.h +++ b/modules/other/gail/gailimagecell.h @@ -21,7 +21,7 @@ #define __GAIL_IMAGE_CELL_H__ #include -#include +#include "gailrenderercell.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gaillabel.h b/modules/other/gail/gaillabel.h index f1012e645c..1b247143bc 100644 --- a/modules/other/gail/gaillabel.h +++ b/modules/other/gail/gaillabel.h @@ -20,7 +20,7 @@ #ifndef __GAIL_LABEL_H__ #define __GAIL_LABEL_H__ -#include +#include "gailwidget.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gaillinkbutton.h b/modules/other/gail/gaillinkbutton.h index 97e5214175..5c7d2331b9 100644 --- a/modules/other/gail/gaillinkbutton.h +++ b/modules/other/gail/gaillinkbutton.h @@ -20,7 +20,7 @@ #ifndef __GAIL_LINK_BUTTON_H__ #define __GAIL_LINK_BUTTON_H__ -#include +#include "gailbutton.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailmenu.h b/modules/other/gail/gailmenu.h index 7efed5e7fa..46da9b3efb 100644 --- a/modules/other/gail/gailmenu.h +++ b/modules/other/gail/gailmenu.h @@ -20,7 +20,7 @@ #ifndef __GAIL_MENU_H__ #define __GAIL_MENU_H__ -#include +#include "gailmenushell.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailmenuitem.h b/modules/other/gail/gailmenuitem.h index 298ead4d80..3dbe509398 100644 --- a/modules/other/gail/gailmenuitem.h +++ b/modules/other/gail/gailmenuitem.h @@ -20,7 +20,7 @@ #ifndef __GAIL_MENU_ITEM_H__ #define __GAIL_MENU_ITEM_H__ -#include +#include "gailcontainer.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailmenushell.h b/modules/other/gail/gailmenushell.h index 53e39f67ac..07b85168a3 100644 --- a/modules/other/gail/gailmenushell.h +++ b/modules/other/gail/gailmenushell.h @@ -20,7 +20,7 @@ #ifndef __GAIL_MENU_SHELL_H__ #define __GAIL_MENU_SHELL_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailnotebook.h b/modules/other/gail/gailnotebook.h index 36cd4c6753..fd16a3b9a9 100644 --- a/modules/other/gail/gailnotebook.h +++ b/modules/other/gail/gailnotebook.h @@ -20,7 +20,7 @@ #ifndef __GAIL_NOTEBOOK_H__ #define __GAIL_NOTEBOOK_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailnotebookpage.h b/modules/other/gail/gailnotebookpage.h index 27778ce292..bcf26f2837 100644 --- a/modules/other/gail/gailnotebookpage.h +++ b/modules/other/gail/gailnotebookpage.h @@ -20,7 +20,7 @@ #ifndef __GAIL_NOTEBOOK_PAGE_H__ #define __GAIL_NOTEBOOK_PAGE_H__ -#include +#include "gailnotebook.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailpaned.h b/modules/other/gail/gailpaned.h index bb4412f004..0078b1bc87 100644 --- a/modules/other/gail/gailpaned.h +++ b/modules/other/gail/gailpaned.h @@ -20,7 +20,7 @@ #ifndef __GAIL_PANED_H__ #define __GAIL_PANED_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailprogressbar.h b/modules/other/gail/gailprogressbar.h index 3640448bb3..8ca5a7f635 100644 --- a/modules/other/gail/gailprogressbar.h +++ b/modules/other/gail/gailprogressbar.h @@ -20,7 +20,7 @@ #ifndef __GAIL_PROGRESS_BAR_H__ #define __GAIL_PROGRESS_BAR_H__ -#include +#include "gailwidget.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailradiobutton.h b/modules/other/gail/gailradiobutton.h index 0a4fe21545..1615e44d6b 100644 --- a/modules/other/gail/gailradiobutton.h +++ b/modules/other/gail/gailradiobutton.h @@ -20,7 +20,7 @@ #ifndef __GAIL_RADIO_BUTTON_H__ #define __GAIL_RADIO_BUTTON_H__ -#include +#include "gailtogglebutton.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailradiomenuitem.h b/modules/other/gail/gailradiomenuitem.h index 8dfa6880e6..0fde2e69b5 100644 --- a/modules/other/gail/gailradiomenuitem.h +++ b/modules/other/gail/gailradiomenuitem.h @@ -20,7 +20,7 @@ #ifndef __GAIL_RADIO_MENU_ITEM_H__ #define __GAIL_RADIO_MENU_ITEM_H__ -#include +#include "gailcheckmenuitem.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailradiosubmenuitem.h b/modules/other/gail/gailradiosubmenuitem.h index 2433a3ba04..3d78b45e6f 100644 --- a/modules/other/gail/gailradiosubmenuitem.h +++ b/modules/other/gail/gailradiosubmenuitem.h @@ -20,7 +20,7 @@ #ifndef __GAIL_RADIO_SUB_MENU_ITEM_H__ #define __GAIL_RADIO_SUB_MENU_ITEM_H__ -#include +#include "gailchecksubmenuitem.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailrange.h b/modules/other/gail/gailrange.h index 7761265cd9..7c3de5daf8 100644 --- a/modules/other/gail/gailrange.h +++ b/modules/other/gail/gailrange.h @@ -20,7 +20,7 @@ #ifndef __GAIL_RANGE_H__ #define __GAIL_RANGE_H__ -#include +#include "gailwidget.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailrenderercell.h b/modules/other/gail/gailrenderercell.h index 6146418685..3e7e3aa92b 100644 --- a/modules/other/gail/gailrenderercell.h +++ b/modules/other/gail/gailrenderercell.h @@ -21,7 +21,7 @@ #define __GAIL_RENDERER_CELL_H__ #include -#include +#include "gailcell.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailscale.h b/modules/other/gail/gailscale.h index fd0252f1c2..20d88da67c 100644 --- a/modules/other/gail/gailscale.h +++ b/modules/other/gail/gailscale.h @@ -20,7 +20,7 @@ #ifndef __GAIL_SCALE_H__ #define __GAIL_SCALE_H__ -#include +#include "gailrange.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailscalebutton.h b/modules/other/gail/gailscalebutton.h index ce79b47c68..4de979c252 100644 --- a/modules/other/gail/gailscalebutton.h +++ b/modules/other/gail/gailscalebutton.h @@ -21,7 +21,7 @@ #define __GAIL_SCALE_BUTTON_H__ #include -#include +#include "gailbutton.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailscrollbar.h b/modules/other/gail/gailscrollbar.h index bfcf1758a0..3b6b6fc383 100644 --- a/modules/other/gail/gailscrollbar.h +++ b/modules/other/gail/gailscrollbar.h @@ -20,7 +20,7 @@ #ifndef __GAIL_SCROLLBAR_H__ #define __GAIL_SCROLLBAR_H__ -#include +#include "gailrange.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailscrolledwindow.h b/modules/other/gail/gailscrolledwindow.h index f7c456dda1..ce454c6e5d 100644 --- a/modules/other/gail/gailscrolledwindow.h +++ b/modules/other/gail/gailscrolledwindow.h @@ -20,7 +20,7 @@ #ifndef __GAIL_SCROLLED_WINDOW_H__ #define __GAIL_SCROLLED_WINDOW_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailseparator.h b/modules/other/gail/gailseparator.h index 67db371ba2..1f3b37729c 100644 --- a/modules/other/gail/gailseparator.h +++ b/modules/other/gail/gailseparator.h @@ -20,7 +20,7 @@ #ifndef __GAIL_SEPARATOR_H__ #define __GAIL_SEPARATOR_H__ -#include +#include "gailwidget.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailspinbutton.h b/modules/other/gail/gailspinbutton.h index fecda124a2..7d1043df43 100644 --- a/modules/other/gail/gailspinbutton.h +++ b/modules/other/gail/gailspinbutton.h @@ -20,7 +20,7 @@ #ifndef __GAIL_SPIN_BUTTON_H__ #define __GAIL_SPIN_BUTTON_H__ -#include +#include "gailentry.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailstatusbar.h b/modules/other/gail/gailstatusbar.h index c8f2d9c9d1..cb9ff09588 100644 --- a/modules/other/gail/gailstatusbar.h +++ b/modules/other/gail/gailstatusbar.h @@ -20,7 +20,7 @@ #ifndef __GAIL_STATUSBAR_H__ #define __GAIL_STATUSBAR_H__ -#include +#include "gailcontainer.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailsubmenuitem.h b/modules/other/gail/gailsubmenuitem.h index 64cd66cb28..9f839c3e3f 100644 --- a/modules/other/gail/gailsubmenuitem.h +++ b/modules/other/gail/gailsubmenuitem.h @@ -20,7 +20,7 @@ #ifndef __GAIL_SUB_MENU_ITEM_H__ #define __GAIL_SUB_MENU_ITEM_H__ -#include +#include "gailmenuitem.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailtextcell.h b/modules/other/gail/gailtextcell.h index c158882748..3ce742a169 100644 --- a/modules/other/gail/gailtextcell.h +++ b/modules/other/gail/gailtextcell.h @@ -21,7 +21,7 @@ #define __GAIL_TEXT_CELL_H__ #include -#include +#include "gailrenderercell.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailtextview.h b/modules/other/gail/gailtextview.h index 5a88aba232..bb2d2334a6 100644 --- a/modules/other/gail/gailtextview.h +++ b/modules/other/gail/gailtextview.h @@ -20,7 +20,7 @@ #ifndef __GAIL_TEXT_VIEW_H__ #define __GAIL_TEXT_VIEW_H__ -#include +#include "gailcontainer.h" #include G_BEGIN_DECLS diff --git a/modules/other/gail/gailtogglebutton.h b/modules/other/gail/gailtogglebutton.h index 6c16382823..6fe9df1bf8 100644 --- a/modules/other/gail/gailtogglebutton.h +++ b/modules/other/gail/gailtogglebutton.h @@ -20,7 +20,7 @@ #ifndef __GAIL_TOGGLE_BUTTON_H__ #define __GAIL_TOGGLE_BUTTON_H__ -#include +#include "gailbutton.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailtreeview.h b/modules/other/gail/gailtreeview.h index aeebfadaa8..e0fcfd48b2 100644 --- a/modules/other/gail/gailtreeview.h +++ b/modules/other/gail/gailtreeview.h @@ -21,8 +21,8 @@ #define __GAIL_TREE_VIEW_H__ #include -#include -#include +#include "gailcontainer.h" +#include "gailcell.h" G_BEGIN_DECLS diff --git a/modules/other/gail/gailwindow.h b/modules/other/gail/gailwindow.h index b417ae89d5..7462551cc6 100644 --- a/modules/other/gail/gailwindow.h +++ b/modules/other/gail/gailwindow.h @@ -20,7 +20,7 @@ #ifndef __GAIL_WINDOW_H__ #define __GAIL_WINDOW_H__ -#include +#include "gailcontainer.h" G_BEGIN_DECLS -- 2.30.2